Skip to content

Upmerge 2023.04.17 #10876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 47 commits into from
May 3, 2023
Merged

Upmerge 2023.04.17 #10876

merged 47 commits into from
May 3, 2023

Conversation

@mbolivar-nordic
Copy link
Contributor

@mbolivar-nordic mbolivar-nordic commented Apr 17, 2023 •
edited
Loading

Regularly scheduled upmerge. Status of handling breaking changes from zephyr (owners are @-mentioned where appropriate):

Quarantined

Other breaking changes:

test-sdk-nrf: testing-upmerge-2023-04-17

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest labels Apr 17, 2023
@mbolivar-nordic mbolivar-nordic mentioned this pull request Apr 17, 2023
Closed
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 17, 2023 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
homekit https://github.com/nrfconnect/sdk-homekit/commit/7d3f3a3e098d64fbf804fc1edfd033ded56d161d https://github.com/nrfconnect/sdk-homekit/commit/286b97f3a7514bc4924818611475ae5be0496ed1 (main) nrfconnect/[email protected]
hostap nrfconnect/sdk-hostap@ff98ecf nrfconnect/sdk-hostap@ec4a32a (main) nrfconnect/[email protected]
matter nrfconnect/sdk-connectedhomeip@032a0a9 nrfconnect/sdk-connectedhomeip@0809166 (master) nrfconnect/[email protected]
mcuboot nrfconnect/sdk-mcuboot@c78d59d (new-history,upmerge-tmp) nrfconnect/sdk-mcuboot@3b7c7fb (main) nrfconnect/[email protected]
memfault-firmware-sdk memfault/[email protected] memfault/[email protected] memfault/[email protected]
nrfxlib nrfconnect/sdk-nrfxlib@9cb7314 nrfconnect/sdk-nrfxlib@2fa09cf (main) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@74c7bca (upmerge-tmp) nrfconnect/sdk-zephyr@b54c8ba (main) nrfconnect/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 17, 2023 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X X
test-ci-nrfconnect-boot-fw-update X X
test-fw-nrfconnect-apps X X
test-fw-nrfconnect-ble X X
test-fw-nrfconnect-ble_mesh X X
test-fw-nrfconnect-ble_samples X X
test-fw-nrfconnect-chip X X
test-fw-nrfconnect-fem X X
test-fw-nrfconnect-nfc X X
test-fw-nrfconnect-nrf-iot_cloud X X
test-fw-nrfconnect-nrf-iot_libmodem-nrf X X
test-fw-nrfconnect-nrf-iot_lwm2m X X
test-fw-nrfconnect-nrf-iot_mosh X X
test-fw-nrfconnect-nrf-iot_positioning X X
test-fw-nrfconnect-nrf-iot_samples X X
test-fw-nrfconnect-nrf-iot_serial_lte_modem X X
test-fw-nrfconnect-nrf-iot_thingy91 X X
test-fw-nrfconnect-nrf-iot_zephyr_lwm2m X X
test-fw-nrfconnect-nrf_crypto X X
test-fw-nrfconnect-proprietary_esb X X
test-fw-nrfconnect-rpc X X
test-fw-nrfconnect-rs X X
test-fw-nrfconnect-tfm X X
test-fw-nrfconnect-thread X X
test-fw-nrfconnect-zigbee X X
test-sdk-audio X X
test-sdk-find-my X X
test-sdk-homekit X X
test-sdk-wifi X X
test-sdk-wifi-EK-shell X X
test-sdk-wifi-radio X X
test-sdk-wifi-scan X X
test-sdk-wifi-sta X X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'
test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-sdk-homekit: added because there was no .github/test-spec.yml in 'homekit'
test-sdk-wifi: added because there was no .github/test-spec.yml in 'hostap'
test-sdk-wifi-EK-shell: added because there was no .github/test-spec.yml in 'hostap'
test-sdk-wifi-radio: added because there was no .github/test-spec.yml in 'hostap'
test-sdk-wifi-scan: added because there was no .github/test-spec.yml in 'hostap'
test-sdk-wifi-sta: added because there was no .github/test-spec.yml in 'hostap'
All integration tests: added because 'CI-all-test' was added manually

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 17, 2023

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

grochu and others added 25 commits May 3, 2023 11:45
@grochu @carlescufi
samples: bluetooth: Adapt to the new oob set flag API.
cdb5f92 
The old API bt_set_oob_data_flag was replaced by 2 new functions:
bt_le_oob_set_legacy_flag and bt_le_oob_set_sc_flag.

Signed-off-by: Michał Grochala <[email protected]>
@maxd-nordic @carlescufi
applications: asset_tracker_v2: fix sensor_trigger
2fed13b 
This patch makes the sensor_trigger structs static since they are not
stored in the driver anymore.

Signed-off-by: Maximilian Deubel <[email protected]>
@lemrey @carlescufi
lib: nrf_modem: update nrf91 offloaded net device API
1289f21 
The API for an offloaded net device has changed from net_if_api
to offloaded_if_api, which introduced an `enable` function pointer.

Give that the API structure was passed to a macro, no parameter
checking guaranteed that the type was correct. Eventually
the networking subsystem would call enable(), which being
uninitialized resulted in a MPU fault.

Signed-off-by: Emanuele Di Santo <[email protected]>
@kkasperczyk-no @MarekPieta @carlescufi
samples: Removed setting LOG_DEFAULT_LEVEL to error
2e1a47b 
Removed settings the LOG_DEFAULT_LEVEL to error, when
NCS_SAMPLE_DEFAULTS config is enabled. It is related to the
change in Zephyr that started to use LOG_DEFAULT_LEVEL
for setting the default log level of every created log module.
The impact was that log level for multiple applications changed
from INF to ERR and CI tests failed.

Additionally aligned the configuration of applications that CI
tests were affected by this change.

Signed-off-by: Kamil Kasperczyk <[email protected]>
Co-authored-by: Marek Pieta <[email protected]>
@leewkb4567 @carlescufi
gazell: Check that a timer node is not enabled in devicetree
0533672 
Gazell does not use a TIMER instance that is enabled in devicetree.
It adheres to the changed timer resource protection semantics.

Signed-off-by: Bernard Lee <[email protected]>
@nordic-krch @carlescufi
boards: arm: Cleanup after counter driver update
99d46b9 
After moving counter driver configuration to the devicetree timer
nodes shall not be enabled if not used. Cleaning up board dts
files.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
gazell: Adapt to changes in counter
2fc7166 
Align to changes in counter driver configuration (from Kconfig
to devicetree).

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
zigbee: osif: Remove use of CONFIG_COUNTER_TIMER2
fab0e58 
Kconfig option was removed and it must be replaced with
device tree node status check.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
applications: zigbee_weather_station: Align to zephyr changes
3d7eb82 
Align application to change in counter driver configuration.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
samples: zigbee: light_switch: Add overlays enabling counter
8b2ea19 
Counter is now controlled by the device tree and it must be
enabled in the sample.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
samples: zigbee: light_bulb: Add overlays enabling counter
aa8babb 
Counter is now controlled by the device tree and it must be
enabled in the sample.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
samples: zigbee: shell: Add overlays enabling counter
1493b11 
Counter is now controlled by the device tree and it must be
enabled in the sample.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
Signed-off-by: Sebastian Draus <[email protected]>
@nordic-krch @carlescufi
samples: zigbee: template: Add overlays enabling counter
6db3d03 
Counter is now controlled by the device tree and it must be
enabled in the sample.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
samples: zigbee: network_coorindator: Align to zephyr changes
7a373ad 
Align sample to change in counter driver configuration.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
tests: zigbee: osif: timer_counter: Align to zephyr changes
a8c41ea 
Align test to changes in the counter driver (transition to DT
configuration.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
tests: zigbee: osif: nvram: Align to zephyr changes
ddb69c3 
Align to configuration counter change (Kconfig to devicetree).

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
tests: zigbee: zboss_api: alarm_api: Align to zephyr changes
c62f86b 
Align test to change in counter driver configuration.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
tests: zigbee: zboss_api: callback_api: Align to zephyr changes
de6c007 
Align test to change in counter driver configuration.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
tests: drivers: lpuart: Align to counter changes
58f829c 
Align to change in counter configuration (from Kconfig to
devicetree).

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
samples: peripheral: lpuart: Adapt to counter changes
0d8fc85 
Adapt sample to changes in counter driver configuration which is
now done through the devicetree.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@nordic-krch @carlescufi
debug: cpu_load: Align timer configuration to upstream changes
2891ba8 
Counter configuration is moved fully to DT and HAS_HW_NRF_TIMERx
cannot longer be used to determine if given TIMER instance is
present. Switching to check if not has timer compat.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@grochu @carlescufi
esb: Adapt to the changes in counter.
aeccaeb 
Adapt to the changes in counter - use device tree
instead of Kconfig for Timer instances.

Signed-off-by: Michał Grochala <[email protected]>
@tokangas @carlescufi
samples: nrf9160: modem_shell: fix array overflow in iperf3
915c5be 
Fixed an array overflow in iperf3.

Signed-off-by: Tommi Kangas <[email protected]>
@mbolivar-nordic @carlescufi
tests: boot_chains: add missing prj.conf
b92af18 
The latest zephyr upmerge has made the absence of this file a hard
error.

Signed-off-by: Martí Bolívar <[email protected]>
@alexsven @carlescufi
applications: nrf5340_audio: Adjust to fit upmerge code
6436c1a 
- Start to use CONFIG_BT_AUDIO_RX/TX
- Some renaming and API changes

Signed-off-by: Alexander Svensen <[email protected]>
@carlescufi carlescufi force-pushed the upmerge-2023.04.17 branch from 69c0090 to 6436c1a Compare May 3, 2023 09:45
@carlescufi
Copy link
Contributor

carlescufi commented May 3, 2023

Merging with all checks passing on current or previous runs. All GH Actions passing and twister too in this run.

@carlescufi carlescufi merged commit e8cfb90 into nrfconnect:main May 3, 2023
ktaborowski added a commit to nrfconnect/sdk-sidewalk that referenced this pull request May 9, 2023
@ktaborowski
manifest: update nrf upmerge 2023.04.17
6ca5509 
[KRKNWK-16741]
nrfconnect/sdk-nrf#10876
* main always return int
* Fix current cosumption nrfconnect/sdk-nrf#10930
* Add PSA config after crypto driver update

Signed-off-by: ktaborowski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leewkb4567 leewkb4567 leewkb4567 left review comments

@jtguggedal jtguggedal jtguggedal approved these changes

@alexsven alexsven alexsven approved these changes

@SeppoTakalo SeppoTakalo SeppoTakalo approved these changes

@rick1082 rick1082 rick1082 approved these changes

@frkv frkv frkv approved these changes

@magnev magnev magnev approved these changes

@tokangas tokangas tokangas approved these changes

@hakonfam hakonfam hakonfam approved these changes

@jangalda-nsc jangalda-nsc jangalda-nsc approved these changes

@trantanen trantanen trantanen approved these changes

@adsz-nordic adsz-nordic adsz-nordic approved these changes

@krish2718 krish2718 krish2718 approved these changes

@maxd-nordic maxd-nordic maxd-nordic approved these changes

@SebastianBoe SebastianBoe Awaiting requested review from SebastianBoe

@joerchan joerchan Awaiting requested review from joerchan

@ludvigsj ludvigsj Awaiting requested review from ludvigsj

@lemrey lemrey Awaiting requested review from lemrey

@martintv martintv Awaiting requested review from martintv

@pdunaj pdunaj Awaiting requested review from pdunaj

@edmont edmont Awaiting requested review from edmont

@jayteemo jayteemo Awaiting requested review from jayteemo

@coderbyheart coderbyheart Awaiting requested review from coderbyheart

@grochu grochu Awaiting requested review from grochu

@koffes koffes Awaiting requested review from koffes

@erikrobstad erikrobstad Awaiting requested review from erikrobstad

+4 more reviewers

@jciupis jciupis jciupis approved these changes

@balaji-srin balaji-srin balaji-srin approved these changes

@plskeggs plskeggs plskeggs approved these changes

@glarsennordic glarsennordic glarsennordic approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-all-test Run All integration tests CI-force-downstream doc-required PR must not be merged without tech writer approval. manifest manifest-homekit manifest-hostap manifest-matter manifest-mcuboot manifest-memfault-firmware-sdk manifest-nrfxlib manifest-zephyr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.